From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 6 Mar 2026 03:43:38 +0000 (+0000)
Subject: Manual merge of version 5.2.2-5+rpi1 and 5.2.2-7.1 to produce 5.2.2-7.1+rpi1
X-Git-Tag: archive/raspbian/5.2.2-7.1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:sonu.itbhu%40googlemail.com//%22mailto:i18n-csb%40linuxcsb.org/%22/%22http:/www.example.com/%22mailto:sonu.itbhu%40googlemail.com/%22mailto:i18n-csb%40linuxcsb.org/%22?a=commitdiff_plain;h=9710a7990b0531e092035d8228bb1ae5d456adce;p=supermin.git

Manual merge of version 5.2.2-5+rpi1 and 5.2.2-7.1 to produce 5.2.2-7.1+rpi1
---

9710a7990b0531e092035d8228bb1ae5d456adce
diff --cc debian/changelog
index 5132140,c9d837b..4cd9350
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,26 +1,39 @@@
- supermin (5.2.2-5+rpi1) trixie-staging; urgency=medium
++supermin (5.2.2-7.1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
 +  * Build-depend on raspbian kernel rather than debian armmp kernel.
 +
 +  [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Dec 2019 01:42:22 +0000]
 +  * Drop linux-image-rpi build-dependency, we currently don't have kernels
 +    in raspbian bullseye.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Sep 2024 10:13:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 06 Mar 2026 03:42:36 +0000
++
+ supermin (5.2.2-7.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Build-Depend on ocaml instead of transitional ocaml-nox (Closes:
+     #1125114)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 22 Jan 2026 09:09:29 +0100
+ 
+ supermin (5.2.2-7) unstable; urgency=medium
+ 
+   * Bump Standards-Version, Debhelper compat level
+   * Add upstream patch to support zstd-compressed kernel modules
+     (Closes: #1082404)
+   * Add Lintian override
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 12 Nov 2025 22:40:38 +0100
+ 
+ supermin (5.2.2-6) unstable; urgency=medium
+ 
+   * Remove kernel build-dependency for i386
+   * Update build-dependencies
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 16 Feb 2025 16:15:42 +0100
  
  supermin (5.2.2-5) unstable; urgency=medium
  
diff --cc debian/control
index 08f95e3,5cb2a10..b2d9c14
--- a/debian/control
+++ b/debian/control
@@@ -15,8 -15,10 +15,9 @@@ Build-Depends: debhelper-compat (= 13)
   musl-tools [amd64 arm64 armel armhf i386 ppc64el riscv64 s390x],
   augeas-tools, libhivex-bin,
   libguestfs-tools <!nocheck>,
+  zstd,
   linux-image-alpha-generic [alpha] <!nocheck>,
   linux-image-rpi [armel] <!nocheck> | linux-image-marvell [armel] <!nocheck>,
 - linux-image-armmp [armhf] <!nocheck>,
   linux-image-arm64 [arm64] <!nocheck>,
   linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel] <!nocheck>,
   linux-image-5kc-malta [mips64 mips64el] <!nocheck>,
diff --cc debian/rules
index 0149784,806c9f2..e906aa1
--- a/debian/rules
+++ b/debian/rules
@@@ -24,7 -26,9 +26,9 @@@ override_dh_auto_build
  	dh_auto_build
  
  override_dh_auto_test:
- 	#dh_auto_test -- SKIP_TEST_EXECSTACK=1
 -	$(info $(DEB_BUILD_ARCH))
 -	dh_auto_test -- SKIP_TEST_EXECSTACK=1 \
 -		$(if $(filter i386,$(DEB_BUILD_ARCH)),SKIP_TEST_BUILD_BASH=1 SKIP_TEST_IF_NEWER_EXT2=1)
++	#$(info $(DEB_BUILD_ARCH))
++	#dh_auto_test -- SKIP_TEST_EXECSTACK=1 \
++	#	$(if $(filter i386,$(DEB_BUILD_ARCH)),SKIP_TEST_BUILD_BASH=1 SKIP_TEST_IF_NEWER_EXT2=1)
  
  override_dh_gencontrol:
  	dh_gencontrol -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(if $(shell which musl-gcc),musl-tools,libc-dev-bin))"